From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat, 9 Nov 2013 16:11:01 +0000 (-0500)
Subject: dash: Make sure we clear the timeout IDs for the label tooltip
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3061
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3991d2729db51ecf6d6ac5a14daa07048c205661;p=gnome-shell.git

dash: Make sure we clear the timeout IDs for the label tooltip

https://bugzilla.gnome.org/show_bug.cgi?id=711732
---

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 13651fa4c..3c5e89d81 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -576,6 +576,7 @@ const Dash = new Lang.Class({
                     Lang.bind(this, function() {
                         this._labelShowing = true;
                         item.showLabel();
+                        this._showLabelTimeoutId = 0;
                         return false;
                     }));
                 if (this._resetHoverTimeoutId > 0) {
@@ -592,6 +593,7 @@ const Dash = new Lang.Class({
                 this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
                     Lang.bind(this, function() {
                         this._labelShowing = false;
+                        this._resetHoverTimeoutId = 0;
                         return false;
                     }));
             }